Renamed XendDomainInfo.getTargetMemory to getMemoryTarget, for consistency with

XendDomainInfo.setMemoryTarget.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py
index 6979e35f31d42505a2ea9abea71ef9f4ad45b605..8bc3d1a1c027385c576546cbee3d202d0fd208e0 100644 (file)
--- a/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@ -339,7 +339,7 @@ class XendDomainInfo:
     def getSsidref(self):
         return self.ssidref
 
-    def getTargetMemory(self):
+    def getMemoryTarget(self):
         """Get this domain's target memory size, in MiB."""
         return self.memory
 

diff --git a/tools/python/xen/xend/image.py b/tools/python/xen/xend/image.py
index b4b9dc4810c5bb3f8151d7cc9ed374e32d1f3224..4fe222bf880845de1fd59e17e385d11d91bb060e 100644 (file)
--- a/tools/python/xen/xend/image.py
+++ b/tools/python/xen/xend/image.py
@@ -313,7 +313,7 @@ class VmxImageHandler(ImageHandler):
                            image          = self.kernel,
                            control_evtchn = self.device_channel.port2,
                            store_evtchn   = store_evtchn,
-                           memsize        = self.vm.getTargetMemory(),
+                           memsize        = self.vm.getMemoryTarget(),
                            memmap         = self.memmap_value,
                            cmdline        = self.cmdline,
                            ramdisk        = self.ramdisk,
@@ -413,7 +413,7 @@ class VmxImageHandler(ImageHandler):
             args = args + vnc
         args = args + ([ "-d",  "%d" % self.vm.getDomain(),
                   "-p", "%d" % self.device_channel.port1,
-                  "-m", "%s" % self.vm.getTargetMemory() ])
+                  "-m", "%s" % self.vm.getMemoryTarget() ])
         args = args + self.dmargs
         env = dict(os.environ)
         env['DISPLAY'] = self.display

diff --git a/tools/python/xen/xend/server/SrvDomainDir.py b/tools/python/xen/xend/server/SrvDomainDir.py
index 7f37ec7a0d257c3924eee348bcee215236c8b027..942a69ea9a714023adc8a4f0e3b0ad10261de572 100644 (file)
--- a/tools/python/xen/xend/server/SrvDomainDir.py
+++ b/tools/python/xen/xend/server/SrvDomainDir.py
@@ -155,7 +155,7 @@ class SrvDomainDir(SrvDir):
                 req.write('<li><a href="%s%s"> Domain %s</a>'
                           % (url, d.getName(), d.getName()))
                 req.write('id=%s' % d.getDomain())
-                req.write('memory=%d'% d.getTargetMemory())
+                req.write('memory=%d'% d.getMemoryTarget())
                 req.write('ssidref=%d'% d.getSsidref())
                 req.write('</li>')
             req.write('</ul>')